Fixed rendering glitch, added more @Override's