big fixes
Merge branch 'bugs'