Cleaned up a lot of feature and issues