FINISHED. Bugs fixed.