Cleared some bugs in custom