Some bug fixing and formatting