Removed unnecesary cursor events, more comments, better dependencies