stuff changed a lot, big fixes, big bugs