Fixed bunch of bugs, works now