Commented Core and AtmoWinHandler and some general cleanup