Added Custom Verb functionality

Fixed some small left-over bugs