Some fixes, but omg ... it's working! :p