moves/fixes, added enum support