Beta 0.4 Re-Upload

Just fixing 2 bugs.