cleaned up vars, added Home/bundle dir