Several improvements
Meeeerge