Fixes

Minor fixes and addiotion