show after hide now works
fix some bugs clean some code