Added more features. Fixed some issues.