various changes
Merged and stuff