big fixes, finishing touches