updated
minor changes
attempted to merge two forks together; this commit probably will not work