More prettifying and fixing small bugs