Fixes

-Fixed custom/costum typo
-Some cleanup
-Fixed possible NPE on interface