fix all the shit again, production ready now!