Made a bunch of changes from user feedback
Fixed conflicts deleting extra library