Added more comments

- Some bugfixes