Places working prototype and various small fixes.