Bug fixes & added features