fixed minor bugs and worked on remove