fixed some small bugs, finalizing the work, so far everything works perfect.