Fixes and addions