Random Stuff And fixes