Added more utils!
Cleaned up and modified stuff :p