Renaming, better output console, nothing much