removed useless comments/fixed some basic stuff