Made fixes and pretty messages :P