- added deeper logging (for all options)
 - fixed some bugs
 - refactored some methods