Some Bugs/Way of life improvements