Cleaned up and small fixes