Added more to units. Commented and fixing constructors.