Amiga bug fix and minor aesthetics