coppied usable goodies from OTI repo
small fixes, got rid of unused and ignored files