Bug fixes, barebones material

Now at a stable build.