Small bug fixes, added some things