Fecking pep8
fess up to some bugs