Fixes and new

Sketch & program fixes