Fixes and add new stuff