Removed 'multi', fixed some bugs and error handling