fixed using statements, fixed bugs