Fixes and new ideas
MOAR stuff