Fixing some bugs from first use