Fixes, cleanup, additions