Some bugs fixed; back stack fixed