Merges serenity. Improves build system.
Build fixes.