Integration of the seconds functionality and miscellaneous fixes