Fix indent size
Added a few nice things