Unbreaking by ploxiln

a continuation of #1, you can see my additional commits at the end