Fixed some thing

some other things are still broken