Fixing some bugs an adding show