Added comments
View improvements and some bugs fixed