Fixed things Shish pointed out