Fixed a number of broken items and added small featutes