Removed unneccesary specs and fixed some features