Small fixes
Added a bit more functionality