Zomgponies

Merging bugfixes into master