Fixed stuff and implemented missing features