Extract method bugfixes & feature

Fixing some bugs and todos from previous pull request.