fixed minor bug and removed useless shit