Updated/deleted some features based on what seems to and not to work.