Fixes and more functions