Fixed buggs, added features