deleted some WIP stuff and small bug fixes