Fixed a few items/improvements