Improvements

Well, its definitly better this way.