fixed bugs and added more specs