Enhanced build
Fixes and stuff