Some fixes and tweaks, started work on Stacker