Fixed stuff.. still unstable