lots of updates.. i need to commit more often here.. sorry but i'm not sifting through this right now