Added more fixes and beautifications