Fix for implementing options, better notifications