fixing some initial bugs