Small changes
Merging
Fixing crashing bug