cleaning up and adding some cool stuff :D