made things more go-like and tweaked the functionality with minor improvements