Code has been reviewed to solve several errors, simplify some parts
and to improve some components.