UPDATE: Some more small fixes, now based on beautified version ;)