Fixed more bugs + Added new specs