Added round implementation, several additions...