lots of updates

needs cleaning