syncing from other computer

whole lot of changes from work done on friday
hm