final commit before deploy; bugs cleaned up