fixing some rookie mistakes