fixed some issues and created some issues