fixed 90% of bugs