Fixed stuff, now works better