Fixes and new stuff added