Removed unnecessary stuff; minor improvements/updates