adding a fade in (possibly bad idea?) and fixing some things