smalls tweaks here and there
work on achievements