fixed errors on show and changed last behavior