Closed and commented on some bugs (Rouslan)