Minor fixes, remove trickery, add readme