updated to 16.1, cleaned up atom boot logic