Removed comments, fixed bugs, explained config option better