Some updates + new build file :P