Fixes and new stuff