Add some check, general cleanup