little additions/removals and cleanup