Small fixes and improvements. Looks like usable.