made things more pythonic
added TODO comments for things I will do later
fixed careless mistakes